From: emellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Date: Tue, 23 May 2006 15:17:28 +0000 (+0100)
Subject: Fix log message written when xenstored corrupts its store.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16025^2~31
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=7bc3fa8ada27334f7f93196dd9152d9972f67d7d;p=xen.git

Fix log message written when xenstored corrupts its store.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
---

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 5c08934cdb..ec31977cdd 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -451,6 +451,11 @@ static struct node *read_node(struct connection *conn, const char *name)
 
 static bool write_node(struct connection *conn, const struct node *node)
 {
+	/*
+	 * conn will be null when this is called from manual_node.
+	 * tdb_context copes with this.
+	 */
+
 	TDB_DATA key, data;
 	void *p;
 
@@ -478,7 +483,7 @@ static bool write_node(struct connection *conn, const struct node *node)
 
 	/* TDB should set errno, but doesn't even set ecode AFAICT. */
 	if (tdb_store(tdb_context(conn), key, data, TDB_REPLACE) != 0) {
-		corrupt(conn, "Write of %s = %s failed", key, data);
+		corrupt(conn, "Write of %s failed", key.dptr);
 		goto error;
 	}
 	return true;